[IA64] Revert ia64/xen-unstable.hg 15561:e487cc249171

This is causing problems, we need to rethink it.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/xen/dom_fw_dom0.c b/xen/arch/ia64/xen/dom_fw_dom0.c
index 6b410a0c32345f649a9ef9598dc6de70367045a5..4eec44b157f9bdbf50ef1296beb9ce5c4c930021 100644 (file)
--- a/xen/arch/ia64/xen/dom_fw_dom0.c
+++ b/xen/arch/ia64/xen/dom_fw_dom0.c
@@ -55,16 +55,12 @@ acpi_update_lsapic(acpi_table_entry_header * header, const unsigned long end)
                enable = 0;
 
        if (lsapic->flags.enabled && enable) {
-               if (lsapic->id == 0) {
-                       lsapic->id = lsapic_nbr;
-                       lsapic->eid = 0;
-               }
+               printk("enable lsapic entry: 0x%lx\n", (u64) lsapic);
+               lsapic->id = lsapic_nbr;
+               lsapic->eid = 0;
                lsapic_nbr++;
-               printk("enable lsapic entry: 0x%lx (id:eid=%x:%x)\n",
-                      (u64)lsapic, lsapic->id, lsapic->eid);
        } else if (lsapic->flags.enabled) {
-               printk("DISABLE lsapic entry: 0x%lx (id:eid=%x:%x)\n",
-                      (u64)lsapic, lsapic->id, lsapic->eid);
+               printk("DISABLE lsapic entry: 0x%lx\n", (u64) lsapic);
                lsapic->flags.enabled = 0;
                lsapic->id = 0;
                lsapic->eid = 0;